Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Ie2cd7c6af915bf53e47e0040333e37be9ee0717c
Change-Id: Ia0ac47dbd9699ccd0edcc3e75903b8b37a85085a