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

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

Change-Id: Ifeeb31e253b082b9803a6e76828f0b71b9ce2af0