Merge Android R

Bug: 168057903
Merged-In: I630a50f699907030a47b83aa8baa26fd0497d7f9
Change-Id: I841f7498d3b0b4c87bbff5959afef13dcac49f4b