Merge "Add android.permission.BIND_RESUME_ON_REBOOT_SERVICE"