Merge Android R

Bug: 168057903
Merged-In: I54d04ed92be7cdaa42c5be776f666d772e1a5214
Change-Id: I85acfc7d20057e896793e180f3a3b9fc779e50a6