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

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



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