tree 95cf443f54ffd146ee5821792c331662ff06c22c
parent 590bb5c0b93111ac68765bd9b17073d6d6e0691f
parent 7e1dad283ac19830dfa2a72c7522a19943ca5333
author Xin Li <delphij@google.com> 1614816734 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614816734 +0000

[automerger skipped] Merge RQ2A.210305.007 am: e420518160 -s ours am: da138ba9f6 -s ours am: 7e1dad283a -s ours

am skip reason: Change-Id I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc with SHA-1 0cdf233f70 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6eaecb972bcf79fcdeb7abf542c82aa70cdcdef3