tree de8eb078a0074d3f7b16aeab032338e98e31a661
parent 76588424f7e19563d30844e33292cbae613ea02b
parent 0a59fe9a915e27798cb40fc622ca7009fab21788
author Xin Li <delphij@google.com> 1598998208 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998208 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 3a6ef723d2 -s ours am: 19431a7488 -s ours am: 0a59fe9a91 -s ours

am skip reason: Change-Id I893d1bd400022b45538169fdb91a1d4502096240 with SHA-1 40f6e6bf20 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/12470170

Change-Id: Ib493e5005831f4770ba08a3203c90b7a61b045a0