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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99ea36c50a38dfc54b69ec5ad46d11d50e458925