Android mainline 11.0.0 release 9
Merge cherrypicks of [12894601, 12894602, 12891329, 12891330, 12894603, 12894604, 12885923] into mainline-release

Change-Id: I4a4c87c055d852f9809ebf4d7fb27c93e685ece2