Merge "Simply ignore invalid keys" into sc-qpr1-dev am: 362b31f106 am: d6c3d4d5ae

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

Change-Id: Ie99c3be48c0dae4063d138dc82d18874b9d92ed3