Merge "Improve audio sharing password handling" into tm-dev am: 0fc61ce2 am:...

Merge "Improve audio sharing password handling" into tm-dev am: 0fc61ce2 am: e5f709d5 am: 1322c6fb

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



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