am 67b7ec28: Merge "Access mock location is no longer a runtime permission -...
am 67b7ec28: Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev
* commit '67b7ec28':
Access mock location is no longer a runtime permission - framework