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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e50ac962959387ec42ee644376e1c10df0dc677
tree: 16ca0b237a6b82ec28394170f4746f814c6cd7fc
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS