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

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