am 30caffc0: resolved conflicts for merge of a1af5cf6 to klp-dev-plus-aosp

* commit '30caffc025aff450ebb354ee693174cc1732732b':
  Handle policy reloads within ueventd rather than restarting it.