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

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

Change-Id: I4f77f758c0175e2270e8c9784211e7b323dcc8e2