Merge "Make SystemUiSystemPropertiesFlags.FlagResolver injectable." into tm-qpr-dev am: f8d2447f60

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

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