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

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



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