Merge "Re-order early return when targetPkg is null" into sc-dev am: 7a3193ae7a am: e41e3fe792

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

Change-Id: I09699a0fd2df07ecf29d96aad5125722f542a7bf