Merge "Update extra info before registering" am: 004dde17a5 am: 74c9a25719

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

Change-Id: I5e38601026c1f9d30fee58a40bfb1ad467f41e35
tree: ba3779a750ecf58dc7fbb4f34a0e21cc31b04191
  1. core/
  2. services/
  3. tests/