Merge "Move the bg battery alert threshold to 10% to reduce clutter" into...

Merge "Move the bg battery alert threshold to 10% to reduce clutter" into tm-dev am: 31330afa am: a9292875

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



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