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