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

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

Change-Id: I151212208ad54f7e91d9d5b6ca2b98d44cff1a61