Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev am: aefa892035 am: 4e1d6f439a
am: cdcb846081

Change-Id: I356b0ab5ed7827738a22e25421e640c2e7921b0d