Merge "Merge "Log locations received by default and add javadocs" into sc-dev...

Merge "Merge "Log locations received by default and add javadocs" into sc-dev am: 35260c6f am: a94ecb5b am: 8af05481" into sc-v2-dev-plus-aosp am: 14da6142

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

Change-Id: I1d90c925d3c65b0d7b6a1f827a2f339a316bf0dd