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

[automerger skipped] Merge Android R am: fedfa99090 -s ours am: 8627fde76b -s ours am: a074024df7 -s ours

am skip reason: Change-Id I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc with SHA-1 a4636f52c3 is in history

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

Change-Id: Ibc9adda558e6415e11100890f9d8875d1c635fb2