Merge "Made ActivityManager.forceStopPackage a @SystemApi"