Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I55980714b5fa0013137f9d39b72b08d068f4b245
Change-Id: I7d2257f8205d89aedf04bf4482ecb11e1239ad6c