Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I84ce0bfd90dc142b01536bb71213048e9f27473e
Change-Id: I8fdb4fcc74c3ca88daaee68bf7b45202901c972f