Merge "Add cpp20 to validatekeymaps" into udc-dev am: 952b462cf9

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

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