am 297f802f: Merge "Add support for reloading policy from /data/system."

* commit '297f802f25d093274c1f5fb890ee8dfacfbf159e':
  Add support for reloading policy from /data/system.