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

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

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



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