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

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

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

Change-Id: Id22ee8078efa23a89620946e004d37a08ad5dd24