Merge changes from topic "transportinfo-explicit-redaction" into sc-dev am: 79d74a64 am: 55dbc46d

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

Change-Id: I412ef4e012a4600ed5622cb0272dc8e0495e80a3