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 '5a4cb3fa6b5794bc61a7da0990c5145e8e9e47ab':
  Using state to update voice button proxy visibility instead of view flags. (Bug 10915381)