Merge "Fixed autofill forged package check to only compare the package name." into pi-dev
am: 2fbdb17cd3

Change-Id: Ife0af02000708eed0b6e94349b043f92d1e08815