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

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