Android 12.0.0 release 18
Merge cherrypicks of [16142592, 16059212] into sc-qpr1-d-release.

Change-Id: Ib81c42f3b29c071f4b78d55356d6c1f42748779c