tree 36fab9a862f8f64d327c308229dcc9196f5ebda1
parent 80bcc6982c191a225b93590856a970ee5fc440b1
parent 19d2a2df918d310363fe9ea447a09cc9072cbc0d
author Xin Li <delphij@google.com> 1599090298 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599090298 +0000

[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