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

* commit '068254cac1b3da43f3dac85f6157d5affb039dca':
  Update accessibility compat classes for N.

Change-Id: Ic79b5dda081adda51d1e9d888fdc79cbc11823cd