Merge "[Bouncer] Revert from shared flow..." into tm-qpr-dev am: 94ae2f13 am: bd5c5830

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



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