tree b35b9f715c89020e8f585c40c05313a43d7cc83d
parent e37e875f80a7a713f11c98eff8aaceb70194dec0
parent 8fb9fc6b2b61ae4c769db1b66fdbb5820f89f6bc
author Xin Li <delphij@google.com> 1599090978 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599090978 +0000

[automerger skipped] Merge RP1A.200720.011 am: a4636f52c3 -s ours am: cfc12ddaaa -s ours am: 19d2a2df91 -s ours am: 8fb9fc6b2b -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: Ie146e31cf06075d04c95977e727f45da2ebaf122