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

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

Change-Id: I23ad6aea92cdb4355ef9ca79ad07acba12de3b69