Merge "Forcefully convert to basic Intent before calling PM API." into tm-dev am: 4220511d7e am: 66dd9d37e4 am: cd9b9a84b5 am: 2851ae7f58
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232666 Change-Id: If010d4166ddf07e38d1a15361d89abbde32ea223 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: