Merge "Remove unnecessary cpp_std: "c++2a"" into main am: 57dc68ad30

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

Change-Id: Ifeeddd86dce21207604603d62649944fb0ac7b5c
Signed-off-by: Automerger Merge Worker <[email protected]>