Merge "Clean up app usage page" into sc-dev am: a30178221a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14250085

Change-Id: Iaef5978ae72b83a948c2716512798fd3a5b4e5e2