Merge Android R

Bug: 168057903
Merged-In: Idbf8064b452046180970762ee90d6539336fd54a
Change-Id: I02e77b1f0125769eac1a34b00261633b8014e5bf