Merge "Add MANAGE_ROTATION_RESOLVER permission to shell application to fix CTS on non-eng builds" into sc-dev