Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: If240d22844ce47df705295965261537d13bb4654
Change-Id: I954262114db9a75706a32b950372806bda82dd03