Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Idec17650fd6063495375d6a26b720286ef02ec96
Change-Id: I9a4ecb69828d5bb3ac343c38a62af0529e29a5ed