Merge "[BUG] audiopolicy: engineconfigurable: prevent illegal map access" am: e355671896 am: e9ea3ceb7b

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

Change-Id: I1cbb4eabf86af03e58d0a9c2c8a58695f30cae91