Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Iec7bcb4802c501343c4dfbeb95b911d540bbf7db
Change-Id: Icde73e653467362081c1f293d6d813a35e99eb3c