tree 95cf443f54ffd146ee5821792c331662ff06c22c
parent 086f928365ae1953e14453473e307ae12597da41
parent 9bbd0d395f3bc798ce3d28511b0b5c0872cfc03a
author Xin Li <delphij@google.com> 1633681807 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681807 +0000

[automerger skipped] Merge Android 12 am: cebf4f78df -s ours am: 5480f1de9e -s ours am: 45877113e2 -s ours am: 9bbd0d395f -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: I87004dae3ad729e2f257f5b085c44d4fc7e5a431