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: e68e84f4 am: 45d9c35c

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



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