Merge "Reduce <CallStack.h> namespace pollution." into main am: d6ccb0b1d9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2974871

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