[automerger skipped] APM: Implementing configuration loading from AIDL HAL am:...

[automerger skipped] APM: Implementing configuration loading from AIDL HAL am: 741c347b -s ours am: 7b93d366 -s ours

am skip reason: Merged-In I7d0f48bf4d9d4bdaa46246aa4dfbcc49e835c6b6 with SHA-1 9e459d73 is already in history

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



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