tree 36fab9a862f8f64d327c308229dcc9196f5ebda1
parent 0f3b3a30fb5687564fde87863525a4c710484524
parent cfc12ddaaab29337401b45fff202bb905b9b0f65
author Xin Li <delphij@google.com> 1599089794 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599089794 +0000

[automerger skipped] Merge RP1A.200720.011 am: a4636f52c3 -s ours am: cfc12ddaaa -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: Ica88309d7bb5c2ac227b0cc9cd00f89861b7670d