[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 4bed340f48 -s ours am: 6c390de4ca -s ours

am skip reason: Merged-In I1a650df14a3fe49914025a02c70ee9728f32fb69 with SHA-1 2573c7ce0a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/20134697

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