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

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



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