Merge "Log locations received by default and add javadocs" into sc-dev am:...

Merge "Log locations received by default and add javadocs" into sc-dev am: 35260c6f am: 109efa36

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15517616

Change-Id: Ia67dce5c35e952c9bf3e98400f34aa40604a0267