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: 3f17057e

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



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