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

* commit '6270c8ee65a33473fbdcbac1800313e4365db3d1':
  Update accessibility compat classes for N.

Change-Id: I71a0d0d713a7f9bf70058438ef9ce986002d21c0