[automerger skipped] Merge "Hopefully fix validatekeymaps mac build." am: 65cef543 am: 83aa7c34 -s ours am: 7ad93b5c -s ours

am skip reason: Merged-In Ibdcdfab2c5160644b9b9453e56a76d47f6d2b9b4 with SHA-1 4bfc6508 is already in history

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

Change-Id: Ica6b12621176b5965c2ae2c3c7813b1466fc89cf