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

Change-Id: I34b3cf6cd42827a1e4fdac4d00ed35fa8ed2be1e