Android 12.0.0 release 16
Snap for 7779705 from 3b96ccbb7d9866728e4d1ce758d98844dc7e17b6 to sc-qpr1-release

Change-Id: I8400135a608e0c16d0151b9cad31cf31cd475b5e