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: 7328ae4d am: ecb043af am: 89bfcb25

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



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