Merge "Merge "docs: Fix for clarification fo location permissions, hardware" into nyc-dev am: 31d5deef80 am: e71d457e64" into nyc-mr1-dev-plus-aosp
am: 9981e410a2

Change-Id: I77d0f9026841fa3b5f41544de6675aa71ae2c32d