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

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

Change-Id: Ie152bac2dcf7404c66bf69cc8c04fd52da6b6d42