am d94d335b: am 2ca8c77b: 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 'd94d335ba010d4bac5e780073b73b6f28b267e74':