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

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



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