tree b4a101c8bdd8f5d622c01f573bcee49f8ad82be0
parent 4792aa54c6416cafcfe816aee67f8f18aec02374
parent 06d476ef6d3f55e45b911dc055f2e20bef86f276
author Xin Li <delphij@google.com> 1646737458 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646737458 +0000

[automerger skipped] Merge Android 12L am: 3fd907d1b3 -s ours am: 06d476ef6d -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: I4097a553b7f5b0cc8eb47cf4bc150da61466cf26