[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6b78bd9323 -s ours

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

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

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