Merge "Merge "Update low battery notification logging timing" into tm-dev am:...

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

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



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