am e4b1fd58: am 5a4cb3fa: am f099eb0b: Merge "Using state to update voice button proxy visibility instead of view flags. (Bug 10915381)" into jb-ub-now-indigo-rose

* commit 'e4b1fd58c335f5b27318baf2128fe0375c4fccde':