Merge "Backport ChooserTarget package source check from N am: 82b9565bd1 am: 6d5f80d13b am: 7ac638702d am: e7e49b48b2" into nyc-dev
am: c99febc3e3

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

Change-Id: I3a0dff11ebe6b4301914b2faf25b8bf65400c4ba