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

[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 am: ed50372b -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: I9d42d526fd5b7e3081e51d4bab548f42e4d28f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>