Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Ib2a68769351e6974b78cd47f1f7967152485c9ba
Change-Id: Ib3a4f4712d811a675418226da8db188a44cac9dd