Merge "Removing privileged context requirement for civic location (server)" into qt-r1-dev
am: addb80c351

Change-Id: I34b3cf6cd42827a1e4fdac4d00ed35fa8ed2be1e
tree: 3a2add0288bd3b6c4d589fd36e95f3c02b3085e6
  1. service/
  2. PREUPLOAD.cfg