Backport ChooserTarget package source check from N am: 82b9565bd1 am: 6d5f80d13b am: 7ac638702d
am: e7e49b48b2

* commit 'e7e49b48b295b4f81ad8a9f5c1d9f16370b06437':
  Backport ChooserTarget package source check from N

Change-Id: I8f735dc92aafba50b3724a1c53390333735012d5