tree 95cf443f54ffd146ee5821792c331662ff06c22c
parent d668b384228f45f6af5e8fe6256494ced8dc1c75
parent 61439fe08d989a974831893ab41c639f6ff4a97b
author Xin Li <delphij@google.com> 1629229613 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229613 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 0ebf6db938 -s ours am: 61439fe08d -s ours

am skip reason: Merged-In I3d0356a797b42e1bb9560704c455688397d03e4c with SHA-1 d668b38422 is already in history

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

Change-Id: Idd7fec5d4fbdeb552e57697b94f665a32ab0d8d6