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

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



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