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

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

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