Merge "Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a am: ec8b526" into nyc-mr1-dev-plus-aosp