Merge "Add missing headers when Building with libstdc++" into main am: e4b64ebecf am: 54e459302e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2616200

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