Merge "Merge "Note BATTERY_LEVEL_CHANGED semantics." into tm-dev am:...

Merge "Merge "Note BATTERY_LEVEL_CHANGED semantics." into tm-dev am: ce680c76 am: 923e6c3e am: 245aa2cd" into tm-qpr-dev-plus-aosp am: 85e21bee

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



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