Merge "Update accessibility compat classes for N." into nyc-dev
am: ab914f51e7

* commit 'ab914f51e7da0b059d500e8591a68d46c35b60b8':
  Update accessibility compat classes for N.

Change-Id: Idb52f38a127d6500ad0c873c16909410f78570af