Merge "[automerger skipped] Merge "Don't throw if the matching key contains...

Merge "[automerger skipped] Merge "Don't throw if the matching key contains ":"." am: 6c6ceed2 am: 277d6276 am: a3bf4324 -s ours" into udc-dev am: a6685bfc -s ours

am skip reason: Merged-In I76e307800017d4dd1e66233b1ff4cc5cbcef7246 with SHA-1 ac19a904 is already in history

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



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