Android 12.0.0 release 18
Merge cherrypicks of [16081891] into sc-qpr1-d-release.

Change-Id: I235c4de381c5a317bb1153da9fcd30610beb2b06