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

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

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