Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: Ibb88bd1de76f8157ee181f6c3b6594c0b0b7489f
Change-Id: I62330f6512d7a9b5982e8c404921de5bfb4fb7f6