[automerger skipped] Merge "Removed BatteryStatsService hidden API calls from Bluetooth" am: 1a0eba9c am: 147352fe -s ours

am skip reason: Merged-In Id0c381e2b41f2a4e2f16b29d1318ad2931960e4a with SHA-1 bcab2e47 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1748246

Change-Id: Ib72856532ca863e51db709f05c0c84f964356929