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

Change-Id: I3dc4209e0310495a2c6a035094e919a46f75a03f