Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Id94d29052a410ccc23c78bd2940989438c3a09d9
Change-Id: I1d7fcd6c20084ad82151219b911a24ba2138c134