[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ec6cf132b8 -s ours am: 9ada1a0ae4 -s ours

am skip reason: Merged-In Ie53d02712a65ff8250dddc2e3f3dd5453be9e9ae with SHA-1 3c0b82fe0c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/openhst/+/20948809

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