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

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

Change-Id: I6eb786edfe615574c731097df09ae3142e137999
tree: 3d5457b2d9bbdd2221a6bd5932253e76f1ce4cf8
  1. core/
  2. services/
  3. tests/