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

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