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

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

Change-Id: Ib9ab5c1549c5154797eb617029727a9dc61db6c3