Merge "Redact privacy sensitive info from logcat" into sc-dev am: 2b1d4908c9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/GeoTZ/+/14690873

Change-Id: I4ebc71964590deea68b3e363792f2ea198f21d1a