tree e9350fdc6d962d5bd0a319b5666f3e116aa6ea5a
parent 3f4dc86ffd7fc9ebede42c24ff8e051013b6ddad
parent e519dde2cc35d4fa970131adae2523b677872778
author Lorenzo Colitti <lorenzo@google.com> 1591805288 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591805288 +0000

[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e am: 0e1b6cb520 am: c889bb9a83 -s ours am: e519dde2cc -s ours

am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 55882575de is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979

Change-Id: I0bdaab9f4f587a097cbf9e982300981b9d75afcd