[automerger skipped] Merge "Plumb APM configuration retrieval from HAL" am:...

[automerger skipped] Merge "Plumb APM configuration retrieval from HAL" am: a357d555 am: 0d4f84f3 am: 4be3e3ef -s ours am: adb48bae -s ours am: 5e45d510 -s ours

am skip reason: Merged-In Icaf043085373ec661be37d4a7a5ed4356aeb4bbe with SHA-1 ffd9771b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2576599



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