Merge changes from topic "b257302229-flag-restart" into tm-qpr-dev am: 69cc3e9d am: 5681ddb3

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



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