Merge Android R

Bug: 168057903
Merged-In: I5f7f3e51d58b8447db8001bba59af73cc9a6bbf1
Change-Id: I7f10efc7a632856c38f8dae7b83a86a5db40170c