Merge changes I23f5d887,I7f65224b

* changes:
  Remove system_server access to location daemon's data
  Remove dumpstate's access to modem dump file