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

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