Merge "Restart after flag changes on screen off." into tm-qpr-dev am: 6fe41592

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



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