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

Change-Id: Ic2403a6e01ee7e35bc364b2f8fec5f4fcc37a24f