tree 95cf443f54ffd146ee5821792c331662ff06c22c
parent 0ebf6db9383d5121bfd63f8bd509770c8ff5351a
parent cebf4f78df98e8c7b28ebe1565bf1d084f4c41a8
author Xin Li <delphij@google.com> 1633656028 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633656028 +0000

[automerger skipped] Merge Android 12 am: cebf4f78df -s ours

am skip reason: Merged-In I745c30269d26b5bef2e5330b565db0cffa3712f5 with SHA-1 0ebf6db938 is already in history

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

Change-Id: Ifcf058a25fafb01e2103aa10b1ee13e1edd3c072