Merge Android R

Bug: 168057903
Merged-In: I13bd92e0dd2a3a4094a7c8e19097a88a94b147b2
Change-Id: I103283b7b5dd8221fc0c1c84945ae2f997b49d04