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

* commit '7ac638702de3b8af0a02db764adb95f2d10d1524':
  Backport ChooserTarget package source check from N

Change-Id: I9d936089af04cc32a54245d91c17a23569c5fd1c