[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 8ddef7059b -s ours

am skip reason: Merged-In I991728196424b9949ddbdc4ebd24d57251bf7429 with SHA-1 4f0e947d3c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/incremental_delivery/+/20137243

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