Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I2087549f00883c6ce2a3d9833cff5fde547afaf1
Change-Id: Icc1029a8dbfdd2ba801781465f51295a4c38627c