Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Ic47cf75c1234634c67b29ee4836353700f3feb20
Change-Id: Ia66f18bfe7c6abf370dd93606bb84c3359389319