Merge "Update app usage page active time column" into sc-dev am: 386d4ba8a9

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

Change-Id: Ibc9fcec23299a5f177a118848a6f6054a3ff5df7