Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Id85e2f80b64a9789407f55e86530548f83743f25
Change-Id: I2020d065db2eacb30304f8d6640cae7b33e2e24f