tree 36fab9a862f8f64d327c308229dcc9196f5ebda1
parent d999268647836d82264f3aa53de741af8eb67f91
parent 26aa485b1e4a71572f3a4ae92fe9167e6989d84a
author Xin Li <delphij@google.com> 1598996829 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996829 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 58f3de5330 -s ours am: 26aa485b1e -s ours

am skip reason: Change-Id I56ccb7002a0f00000936ba02c1926fb4929ae34b with SHA-1 f8dafc97e2 is in history

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

Change-Id: I616d5affba9b5281e6c566d85482ab98427ef495