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 am: d59b5878 am: f90ab762

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



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