Merge Android R

Bug: 168057903
Merged-In: Ib6931e3695458d743667dff2d59acfd156415019
Change-Id: I6912598bd18f5a7ded5182aa767633de4a47b0f2