Merge "Fix unqualified-std-cast-call compiler warning" am: 4e21d361e9

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

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