Merge Android R

Bug: 168057903
Merged-In: Iadd29bb5e9261c072ae58bcada1f1aa2fd49dbe5
Change-Id: I6250f64b5430e77f1053320cdb8f2ecb1bc8b9e2