Merge "pm: skip scan-as-privileged for OMR1 vendors" into pi-dev