Merge Android R

Bug: 168057903
Merged-In: I00a0930452a689304126c64ce8dd6ed837ff9b74
Change-Id: Icc6baf8f4ff0b035abc55a7dc7aa1fdfa01a566f