Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d304

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



Change-Id: I2cb164d28c75c4de511c18548130835570a170c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>