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

[automerger skipped] Merge "Merge "[Output Switcher] Sets TemporaryAllowList when transfer from local to remote (or oppsite way)" into tm-dev am: 3a4731d9 am: 2ff2c211" into tm-d1-dev-plus-aosp am: 7700ee15 -s ours am: b6a9d799 -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: I41a55e754dac40d3707611a57242c54ec3ef52a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>