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

[automerger skipped] Merge Android R am: fedfa99090 -s ours am: 8627fde76b -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: I167bece226b605e1ab637c1b176d80d920d31438