Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I04e605d8a5d899336bc6dd335bc344ffd55c69f0
Change-Id: Ifeac4c2c9b786d4be4fe62f87a83f679546f7c95