[automerger skipped] Merge "Refactor flags of Power Anomaly Tips in Settings...

[automerger skipped] Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev am: 02b54914 am: 8596b78a -s ours

am skip reason: Merged-In I826f517aa61e0c970048164706c4512ac3e0472d with SHA-1 2c0242be is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24663389



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