Merge "Merge "Sanitize Uri.toSafeString() some more." into tm-dev am:...

Merge "Merge "Sanitize Uri.toSafeString() some more." into tm-dev am: b6da699d am: 5e40d2ef" into tm-d1-dev-plus-aosp am: 63fa7492 am: 4893f1c6

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



Change-Id: I7e901f8d3bc832cd5e5d82ef75c01b444d6f7bcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>