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

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

Change-Id: Ia3c464ab89147e28cdd32d0cc2d6a1d7da73a32f