Merge "Add support for more keycodes to reference remote control." into tm-dev am: 1ccb6f2a

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



Change-Id: I7774ccbc0e01aa169a98f4637feb50527f3673d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>