Merge "Revert "Update accessibility compat classes for N."" into nyc-dev am: 9594cc3fcd
am: aa4c64544f

* commit 'aa4c64544ff9dfe4738facec5d44e29825f1b253':
  Revert "Update accessibility compat classes for N."

Change-Id: Ib2b2347d27c25b45557f6453293e6e2e5c533bb8