[automerger skipped] Merge "Rate limit BatteryStats' ModemActivityInfo...

[automerger skipped] Merge "Rate limit BatteryStats' ModemActivityInfo querying" into tm-qpr-dev am: c3ea7bd9 am: d6a834dd -s ours

am skip reason: Merged-In Ie0af28dbc2ad4836ef6437c0656dc20eec2285ea with SHA-1 be40990e is already in history

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



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