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

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

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

Change-Id: Iee50671a7363ed0e820494cbbb06b71063d01f6a
tree: 378243e8b5ffdd1ac8964cdea9fbd88843ae54ef
  1. core/
  2. services/
  3. tests/