am: 6d5f80d1 * commit '6d5f80d1': Backport ChooserTarget package source check from N Change-Id: Iec7902498e2cfe53ce16dc9faf2d91340f416799