Merge Android R

Bug: 168057903
Merged-In: I98b9f287a2881ec98f6f69d6089fa0190a0ee2fe
Change-Id: I45975278e02ea92d7886a0d6dba8fbebe6de4e5c