Merge "Unbreak extraInfo values returned to apps." am: 877ef7634f am: a035f85997

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99ea36c50a38dfc54b69ec5ad46d11d50e458925
tree: 6e71cd7fd9f0bb2b5f83a05c56d8f1333ba18932
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS