am 9c083c55: am f96bcb41: Merge "Access mock location is no longer a runtime...
am 9c083c55: am f96bcb41: Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev
* commit '9c083c55':
Access mock location is no longer a runtime permission - settings