Merge "Fix refactoring error in MicrophoneInfo" am: 5899437c3f am: 2a60337c35 am: cd2fe321e7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2448863

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