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 am: 8af05481

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

Change-Id: I0af83245a6cd08f71de3621b68d5e2a2e77cd266