am: 82b9565b * commit '82b9565b': Backport ChooserTarget package source check from N Change-Id: Ic7e4a8e80829ccb0b2f60c572eea15d18d6658ec