[automerger skipped] Merge "Re-order early return when targetPkg is null" into sc-dev am: 7a3193ae am: fdf9c108 -s ours am: 3992761c -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: Ie042d70fe57562cad88963f7b9664432f284e9f2