Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I14048e3a7575f49da4cc945f32d2df839a4f0a00
Change-Id: If29d13904ad08d858094db9dd4b4abace9ce81b9