Merge "follows the advice of -Wsign-compare" am: 06ea5f150a am: 300005809b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I421c1026955efdb61b0fca0ccc7b0740df5598d6