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

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

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