[automerger skipped] Merge "App anomaly tips on PowerUsage App list" into...

[automerger skipped] Merge "App anomaly tips on PowerUsage App list" into udc-qpr-dev am: 821ed070 am: 8d91b311 -s ours

am skip reason: Merged-In Ic02db49cb3794ef134759d9dcec5f5ef32454a95 with SHA-1 56ba1c09 is already in history

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



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