[automerger skipped] [Safer intents] App Time Spent Preference am: 87dbf9c4 -s ours

am skip reason: Merged-In I2af7b53a75fe5c6915dd9781406039822789c18c with SHA-1 426cbd62 is already in history

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



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