Merge Android R

Bug: 168057903
Merged-In: I249e6ecc866b68d270cbe6066c8fcc4dfc2364a3
Change-Id: I543e7fa16d5b41da432a43a9006a9aa9bf763b39