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: 109efa36 am: 7396bb92

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

Change-Id: I90ce2247afe1ee53be4529468ad821215585fbdb