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

* commit '95335296307c03a8db38b4e8857ca6192f86a494':

Change-Id: I66b10749bc7898fc819e4a178f7536fd582e432c