Merge "[automerger skipped] Merge "[Output Switcher] Sets TemporaryAllowList...

Merge "[automerger skipped] Merge "[Output Switcher] Sets TemporaryAllowList when transfer from local to remote (or oppsite way)" into tm-dev am: 3a4731d9 am: 6923a28e am: 6a589518 -s ours" into tm-qpr-dev-plus-aosp am: f11771ac -s ours

am skip reason: Merged-In I32a823919b48fd784d354858c7e3b1070a723e28 with SHA-1 ab7e8ff2 is already in history

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



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