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

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

Change-Id: I6856edaea26cc2356a13471c1c9810946da2bb12