[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 465b8b38a1 -s ours am: 482bc92ea6 -s ours

am skip reason: Merged-In I2c5864f2229b9e990e04875d22666cf831a9c234 with SHA-1 480522bbf6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/parameter-framework/+/19094707

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