Merge changes from topic "sb-flags-new" into tm-qpr-dev am: c8645ff1 am: ebc91f3f

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



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