[automerger skipped] Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b am: a8e4522f8c -s ours
am skip reason: Merged-In I2af7b53a75fe5c6915dd9781406039822789c18c with SHA-1 87dbf9c4b8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30341738
Change-Id: I2e3e5543d1b687850f1ccf4a8dd0421c7cdcaa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: