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

Change-Id: I655c45bace10a69437cad9536f30b19c09692186