Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Iad1cef62b6c812f214a30bc891779497c40a766d
Change-Id: If154800d40e3be9b4a61290bd6857fec52ad5870