Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I13480bb2489b45a0eea0310acac16de05ece2df1
Change-Id: I3bcd185528ed2640a619fe261ef5eb316e8769b8