Merge "[AAPM] RestrictedPreference tests for advanced protection" into main