Merge "Merge "Deliver latest intent extras to recents" into rvc-dev am:...

Merge "Merge "Deliver latest intent extras to recents" into rvc-dev am: 5463497b am: e6101478 am: 1b544ad1" into rvc-qpr-dev-plus-aosp am: b90738ae

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

Change-Id: Ic00508a83308d6b4aea7361503bea0c320ab55d0