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: 7c8b5393 am: 7e90b91c am: 28d0811b

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



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