Merge Android R

Bug: 168057903
Merged-In: I58a3e97a45b4b1b030d9840e640a5aab10e6afbd
Change-Id: I812ad88efd7cb82a0a78d3473a6d012bc8aab616