Merge "Fix key alias string comparison" am: 15d1ab2fdd am: 6939d8d665 am: 6e3e7a66b3 am: f19fe77861 am: 1eebc04b3e

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

Change-Id: Ia5b90ecda19904662246bea8cf874a0efc726bd6