Merge "Suppress the prompt for the apps with high bg battery usage" into...

Merge "Suppress the prompt for the apps with high bg battery usage" into tm-dev am: a5fdb746 am: 263086bb

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



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