Merge Android R

Bug: 168057903
Merged-In: I3e18a4cda4bca9d13cc43f891a1a11d47d7c4e99
Change-Id: I9ca00c70d4aaf46e72a2344fe29511f67d389e52