tree b35b9f715c89020e8f585c40c05313a43d7cc83d
parent b25097c6c7b25fed7af833a713cc57073b28ac80
parent 15d9c8fcb08a5223e9b698a7cf4369ecdbec34ce
author Xin Li <delphij@google.com> 1599859677 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859677 +0000

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