[automerger skipped] Merge RP1A.200720.011 am: a4636f52c3 -s ours am: cfc12ddaaa -s ours am: 19d2a2df91 -s ours

am skip reason: Change-Id Ica9cd13410aaddd291c73c4f7a75fdc4b17f189a with SHA-1 26aa485b1e is in history

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

Change-Id: Ib450bb51c1f6c269fcfca70030040ef4ad94673d