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