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