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

Change-Id: Id2fbc3ae31e60d2940be6c9fbf01147f5d3d376d