Merge "Update accessibility compat classes for N." into nyc-dev am: ab914f51e7 am: 5320e81941
am: 47c11c4120

* commit '47c11c4120488d8ee949cb80a487779725c33b30':

Change-Id: I57dd7be373dbdfd8670c23969108021d8863309e