Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Ieb008c840554874294cb0d2ec5679c771e698698
Change-Id: Ie6b9ae0a48a37c34ce69b3d2b93d3f3635a2d05b