Merge "Add battery usage tracking on cached apps for the bg restriction" into...

Merge "Add battery usage tracking on cached apps for the bg restriction" into tm-dev am: 61c2927b am: ea5e3528

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

Change-Id: I3e2c5d278df2a582f62d2b7050b78f5ab09996a2