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

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



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