[automerger skipped] Merge "HAL V7.0: Update example APM config files" am:...

[automerger skipped] Merge "HAL V7.0: Update example APM config files" am: 7aacb78d am: b466f2f8 am: 55f23e06 -s ours

am skip reason: Change-Id I3eef9bf1e9bcc24a869355724aa333c1f93b4b31 with SHA-1 049c4be6 is in history

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

Change-Id: Icaec29c6b9a3c29267fb0de419c6b5ab1cb5a1c9