Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I731ca03e919698dd4228cffd9ced4511e5de9927
Change-Id: I2238071d6bef76834283aaa13ac42c1eb421137f