Merge Android R

Bug: 168057903
Merged-In: Ia0f5161cd59b7c5fdcf32848792c2f6149a901ad
Change-Id: I54c80458bb4b22ec9f5f902f0b7b44d073b94d5d