tree 18c0eba11b16fb4af42e77e3f56ec6f56766dda6
parent 6535892e394efe7fc489d77393a218217f08536b
parent fb982cdd6ffd500180e91aa882c8b8349d4491e9
author Xin Li <delphij@google.com> 1646827609 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646827609 +0000

[automerger skipped] Merge Android 12L am: 3fd907d1b3 -s ours am: 06d476ef6d -s ours am: a4d502557d -s ours am: d2f9882359 -s ours am: fb982cdd6f -s ours

am skip reason: Merged-In I504cece275a216e5e849969cdb4d9502ca184593 with SHA-1 86a0d86096 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/2013194

Change-Id: I5e875514736df814aa4063ae836ca26e838ca2a9