Merge "Simply ignore invalid keys" into sc-qpr1-dev am: 362b31f1 am: d6c3d4d5 am: 603d04b8

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

Change-Id: I8a182e39f631791eb37234a5c23c6a87e20ba508