Merge Android R

Bug: 168057903
Merged-In: I234fab995f2ff04cd9bd0b3c80ddd7c54cd8b799
Change-Id: I0c469ed69edd32aa85b0d616e87aa639935b2cdb