am c0e1bc1c: Merge "Drop /data/system as a policy file location"

* commit 'c0e1bc1c755b165574c761e878b6fc26fb340ba0':
  Drop /data/system as a policy file location