Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I78ca8f4144fccc0b21f153d44b2dde13f7c8433e
Change-Id: I71dc18a25eaf6eb38c0dc2ed7d5c3408d20ea8a7