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