Merge "Fix the missing std" am: 39337adcc9 am: a4ab908631 am: d65d1a6b64

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2468920

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