Merge Android R

Bug: 168057903
Merged-In: Idc7ddb63acda5e6fdea80145bb479a6aff369e70
Change-Id: Id7fef346dfdde1ac5d91c2d723a5493342f29248