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

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

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