Merge "Remove bluetooth state change logging from BatteryStats" into udc-dev...

Merge "Remove bluetooth state change logging from BatteryStats" into udc-dev am: fda3c4c7 am: b9158232

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



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