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

Change-Id: Ic68852768c3f8e593c5b960990cecd3e9b0b7efa
tree: 66489d2e1bffb5661ef2b8daf15e679dca8d7983
  1. service/
  2. PREUPLOAD.cfg