Merge "Follow-up commit of aosp/2329897" am: d0d4fe20c1 am: f57cd5740c am: ab7f39d348

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

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