Merge "Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST" am: 1710dbd097 am: c3fb05c1db

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

Change-Id: I6da0050ca6e1cf3907d4e19fefa391da1816641a