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

Change-Id: Ic15f43714d28afbd06d55afe779ff8eea06920c7