Merge "Throw on revoked location permission - framework" into pi-dev
am: 4acd39d3db

Change-Id: Ia4dd0dc5bc0296da541d68714f54c68a75cb32cc