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

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



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