Merge "Additional location logging" into sc-v2-dev am: e56fbfa9f4 am: e4a6f14337

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

Change-Id: I21ac39df024565c16d75e23d2370043a13e05f1b