Merge "Move car companion device support app perms to framework"