Merge "Don't throw if the matching key contains ":"." into udc-dev am: 9c31083850

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

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