[automerger skipped] Merge "Changing package for audio_policy_configuration_V7_0" am: a1736399 am: b5cb89cf am: 9303e15d -s ours

am skip reason: Change-Id I9ac83a98256404313b5efef17c0a164d2ee72136 with SHA-1 e502a601 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1518401

Change-Id: I6dc11fb6549ee5769671ee29a8299c90530a40ae