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

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



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