Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I611d7f821113f23f65903fd01bdd4148bb330920
Change-Id: If870af03f8bfa8252a43d1c993c4c951dd7b8c46