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

* commit 'cc98f78dd914a66d8543dfdd3b932c43651e158a':

Change-Id: I634f092416e3396fce3432c3fcd6e9f50fcffd60