Merge "Update accessibility compat classes for N." into nyc-dev am: ab914f51e7 am: 068254cac1
am: b42c338256

* commit 'b42c338256219cd9724d56b01e77d94d4d10a635':
  Update accessibility compat classes for N.

Change-Id: I09e852fc3c803e8a9104167a3406dcc5218e9ea8