Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 am: ab5d157062

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

Change-Id: I31d939fbb443e76fc912dfe663d0b5a060ecba22