Merge "Fix key alias string comparison" into sc-qpr1-dev am: 1e1fa11538

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

Change-Id: I8015c03c376e7995ff02103e992ae904a4e43030