Merge "Add an entry in developer options for location tools." into nyc-dev