[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: 956a9bc9 -s ours am: 1fab9c08 -s ours am: b771fd53 -s ours

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

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

Change-Id: Id658f9ed7cc293697b9352196b9f6b42f4fbe741