Merge Android 12 QPR 3

Bug: 236045730
Merged-In: Id99ebcc6ae693f613dae3ddbdc8dbb28855171de
Change-Id: I379a1807b3ce4a802e7458cbe0655c7240159b64