Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Ifec453245267ea9b6ba641077776e26fd041747d
Change-Id: I3879f62f2545db0564de5da3894ba653ba8cde44