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

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

Change-Id: Iae81d8a5565ccd1a139be11cfa6236021c7813cc