Merge "Add missing headers when Building with libstdc++" into main am:...

Merge "Add missing headers when Building with libstdc++" into main am: e4b64ebe am: 54e45930 am: 9c0dd99b

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



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