Merge Android R

Bug: 168057903
Merged-In: Ie05b0b03ae70e57a8b05d5308599b43531be35d3
Change-Id: Ie9d7a0a0774b04b12f82d623417c0e58a06af937