Merge "Fix mic address augmenting in APM" am: d1500deaf0 am: e75bc7c050

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

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