Merge Android R

Bug: 168057903
Merged-In: I977fffd03c77413dbec648254a59dfcb1cd23d8f
Change-Id: I7bcfedbfc72b862ac06a8953fa522aeef906422d