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

* commit '5320e819412ad1b1cf6e6962479357cf5eb30831':

Change-Id: I9d61ecb7ef32f0a262a2764eae8e7c0f5d977119