Merge "Use less SysUI specific code in Flags." into tm-qpr-dev am: 45e2aafa

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



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