Merge "Revert "Enforce declared permissions on getCellularBatteryStats() and getWifiBatteryStats()"" into sc-dev am: b1a13a73 am: faacf61a am: a3c65fe9

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

Change-Id: Ibe32d5d7b2712c37083b5ec7a020445fff5c0a5e