Merge "Merge "Update low battery notification logging timing" into tm-dev am: cb417881 am: 5c37ab98" into tm-d1-dev-plus-aosp am: c016add0 am: 57ad1887

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



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