Merge "Update extra info before registering" am: 49d2af36 am: cb4ec422 am:...

Merge "Update extra info before registering" am: 49d2af36 am: cb4ec422 am: 5422d57f am: d7e7c7eb am: c92d9efb

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

Change-Id: Idade27520bfda8ca33142c6d2825a504c9cccead