Merge "Do not separate flow into two." into tm-qpr-dev am: 4f5270a4 am: 42341759 am: bb81ad89

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



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