Merge "BatteryStatsService: limit logspam" am: ca44627df9

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

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