Merge "Make App info page support new battery entry" into sc-dev am: f2a884b8be am: 81fb7ab045 am: b6bc1d1957
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800151 Change-Id: Ice9bc741fd5d1deac1fd878310cc70195b2bf588
This commit is contained in: