Merge Android R

Bug: 168057903
Merged-In: I07ed9f116d13f0e93647749bb64027479ddf7749
Change-Id: Ibb8ad3bd3f3275b8b527e8f4d994191d3299b30a