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: a94ecb5b

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

Change-Id: If8c20bc5c026a36bb1af1e009c9f3a2ea72fc083