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

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

Change-Id: I398fea4b49c01d36c7c9338a227266fbfd6f5bc5