Merge "Fix key alias string comparison" am: 15d1ab2fdd

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

Change-Id: I20bb1006d93233dfe7dd73c12a0eaadee229e3d5