Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I9e64f07a80578a3defabd93f5f8117232e18c222
Change-Id: Iefa903cc1449088938d35d609b5e400e87dc4580