Merge Android R

Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.