Merge "Remove instructions for specifying package in ACTION_MANAGE_OVERLAY_PERMISSION"