Merge "Fix key alias string comparison" am: 15d1ab2f am: 6939d8d6 am:...

Merge "Fix key alias string comparison" am: 15d1ab2f am: 6939d8d6 am: 6e3e7a66 am: f19fe778 am: 1eebc04b

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

Change-Id: Ia5b90ecda19904662246bea8cf874a0efc726bd6