Merge "Merge "Remove problematic letter spacing from keyguard" into qt-dev am: 75e8a9b8f4 am: a071be66d9" into qt-r1-dev-plus-aosp