Merge "[Output Switcher] Add flag for follow up update" into tm-qpr-dev am:...

Merge "[Output Switcher] Add flag for follow up update" into tm-qpr-dev am: ca906a1e am: 2d7dc196

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



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