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

Change-Id: Ie156ad849e61adcb10973459853c286eb88ed399
tree: 5d4d287d22e9dade9730387194bd419f5a57f75f
  1. service/
  2. PREUPLOAD.cfg