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

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

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