[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 -s ours am: 0a059084a0 -s ours am: 9fdb7018d5 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 d4f8954b27 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979
Change-Id: I24f4975c818a6857feee0082245bfb33af3911ff
This commit is contained in: