Merge TP1A.221105.002 to aosp-master - DO NOT MERGE am: dca3ba6ffe

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2293067

Change-Id: Ie41e67d7bd05a735a1c3e04c0b9304b741098125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>