Merge "Remove bluetooth state change logging from BatteryStats" into udc-dev am: fda3c4c7d8 am: 7328ae4d7e am: e68e84f444

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

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