[automerger skipped] Merge "Re-order early return when targetPkg is null" into sc-dev am: 7a3193ae am: 420b41ed -s ours

am skip reason: Merged-In I7c6b2dcdb77c543e0826e5dff0ddc9f66e489033 with SHA-1 21a84738 is already in history

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

Change-Id: Ie06cd78871e5521decbfa30b0fea98bd99764d8e