Merge "Line number of modifier keys is relying on the height of keys' view" into main am: 148d2ae86e

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

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