Merge "Update the text of background app battery usage notification." into...

Merge "Update the text of background app battery usage notification." into tm-dev am: 885af3d5 am: e0f22a06

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



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