Merge "Merge "[DO NOT MERGE] Skip whitelist checks for updated privileged apps" into oreo-mr1-cts-dev am: c9a8c79146  -s ours"