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

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

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