Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 9d6f1bf413 am: 34d90e3fc7 -s ours" into rvc-d1-dev-plus-aosp am: 567a9ed4de -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: Iac524d19a8a357a3248368a4bfe15ffa668cdb1e
This commit is contained in: