Merge "Switch to C++20" am: a7acd5d5a7 am: b1dfb7b9d7 am: 4e29c9d09b

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

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