Merge "Forcefully convert to basic Intent before calling PM API." into tm-qpr-dev am: aec1a526

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



Change-Id: I1ea0c55c86bf8a53c4668042fa2a8e8df22441b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>