Merge "Unbreak extraInfo values returned to apps." am: 78cf2f60e5 am: 4fe7f5bf8b am: f7bc7a0532

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e50ac962959387ec42ee644376e1c10df0dc677