Merge "Factor out repeated code into function" into main am: 660c788c52 am: d99059a3d1

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

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