[automerger skipped] Merge "Improve audio sharing password handling" into...

[automerger skipped] Merge "Improve audio sharing password handling" into tm-dev am: 0fc61ce2 am: e5f709d5 am: 1322c6fb am: d59b5878 am: f90ab762 am: 8d56b11e -s ours

am skip reason: Merged-In I10c21973340ff4bc8e4f1507b1136890aad43715 with SHA-1 1c8a53c8 is already in history

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



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