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

am skip reason: Merged-In Ie5ca5b7a60339ae8cdebc67ba4d44218ad7f071e with SHA-1 5518300208 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/20136926

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