Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Iefab35cff172f4afcbeb81f0f1bde77f0be3af5f
Change-Id: If4e76da87b4393115890f819a6adcb50895dd7ce