[automerger skipped] Merge RQ2A.210305.007 am: e420518160 -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: I5ac3eea1cf57c8c2b4e10e53dd9fe5af9658165c