am: e7e49b48 * commit 'e7e49b48': Backport ChooserTarget package source check from N Change-Id: I8f735dc92aafba50b3724a1c53390333735012d5