Fix the missing std am: 7edcd7cd66 am: ea6967d4e8 am: 9ef2d32a13

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

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