[automerger skipped] Merge "[Safer intents] App Time Spent Preference" into...

[automerger skipped] Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d304 am: 3c8101a3 -s ours am: 169fa08b -s ours

am skip reason: Merged-In I2af7b53a75fe5c6915dd9781406039822789c18c with SHA-1 87dbf9c4 is already in history

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



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