am f21e7d31: am aa3a93ed: am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs

* commit 'f21e7d31582b404e479d9a594f192e67e2b95d8f':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.