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

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



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