Merge "Enforce declared permissions on getCellularBatteryStats(), getWifiBatteryStats() and getGpsBatteryStats()" into sc-dev am: 940921d0 am: 39cc66f9

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

Change-Id: Ib8b29ee0a1c5e6609755aaeab0ef732de8d93ff0