Merge Android R

Bug: 168057903
Merged-In: I5ba640a8fb8b578755c1a7366d368ef1d81f7160
Change-Id: If96e0ed2ac67e0bbfda6a6ddcb55a405d3d5e000