Merge "Hopefully fix validatekeymaps mac build." am: 65cef543b4

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

Change-Id: I9848a71f464cb9c0ee127559f67e88f0f96b2d92