Merge "Use mContext directly, and enforce via logging"

        // Inform checkpointing systems of success

        try {

            // This line is needed to CTS test for the correct exception handling

            // See b/138952436#comment36 for context

            Slog.i(TAG, "About to commit checkpoint");

            IStorageManager storageManager = PackageHelper.getStorageManager();

            storageManager.commitChanges();

        } catch (Exception e) {

            PowerManager pm = (PowerManager)

                     mInjector.getContext().getSystemService(Context.POWER_SERVICE);

                     mContext.getSystemService(Context.POWER_SERVICE);

            pm.reboot("Checkpoint commit failed");

        }