Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I407a728f1fdec88ba474df67ed989e16c8ad4738
Change-Id: I5b43c60ef667d60117969e8be41dccfa1644e0c5