[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 am: 34d90e3fc7 am: c889bb9a83 -s ours am: fb3f862159 -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: I0bdaab9f4f587a097cbf9e982300981b9d75afcd
This commit is contained in: