[automerger skipped] Merge "[Output Switcher] Fix recyclerview flickering"...

[automerger skipped] Merge "[Output Switcher] Fix recyclerview flickering" into tm-dev am: fedcf34f -s ours

am skip reason: Merged-In I7532a54a6b0fa945a4c87a9b8abb39f51d3a9aba with SHA-1 1d25d0b5 is already in history

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

Change-Id: I577a13050e032737ac6ded11ea8cb807c0621a02