am: 7ac63870 * commit '7ac63870': Backport ChooserTarget package source check from N Change-Id: I9d936089af04cc32a54245d91c17a23569c5fd1c