[automerger skipped] Merge "Fix key alias string comparison" into sc-qpr1-dev...

[automerger skipped] Merge "Fix key alias string comparison" into sc-qpr1-dev am: 1e1fa115 -s ours am: 9f13ddc8 -s ours

am skip reason: Merged-In I2c5e47283eed5694951869e9ea3853364ddef9d1 with SHA-1 11cce949 is already in history

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

Change-Id: I16215c4372ff96189a9e07acf59b15221c015b78