Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev