Merge "Fix unqualified-std-cast-call compiler warning" am: b8ceb69f55 am: 2af4bac699

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2188039

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