Merge "Revert "Add an entry in developer options for location tools."" into...
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b am: 704476a9
am: 1aa166f4
* commit '1aa166f4':
Revert "Add an entry in developer options for location tools."
Change-Id: I93d4f261feb7efdeae5559eba729066c4f4061e2