Merge "Silently ignore force stop API for protected packages" into pi-dev
am: df88614db2

Change-Id: I1490c123b60b05798584306af9c971a3411729cc