[automerger skipped] Merge "Update extra info before registering" into rvc-dev...

[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f89 -s ours

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

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

Change-Id: Iee50671a7363ed0e820494cbbb06b71063d01f6a