Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 am: 0796fa5254

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

Change-Id: I85a1b1a2f43df5cf78abc902abb0633fd97bf469