Android 11.0.0 Release 21 (RQ1A.201205.008.A1)
Merge cherrypicks of [12960599, 12959910, 12960718, 12960387] into rvc-qpr1-release

Change-Id: Idbfe226611b09c93853a37718bd680d4da3a5b34