Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Ie66201613ae3310c7ea9413c0b5a21a5f2065cb1
Change-Id: I0222f56d7cf7e85cb810af6ba93e5372e8fa405e