Merge "Fix minor compos_key_cmd problems" am: e89adb650e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1907810

Change-Id: I748a6c168dd1b7a074eb04659fda22f49955cf1f