Merge Android R

Bug: 168057903
Merged-In: Idd09cd2ecd3045625f3c10c41cad2f2af7850dd5
Change-Id: I5d133db4a96c13c52e4fae3e44d1d21d7b60839a