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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I996dc12f68684a34d383fea6861ebb5a4959ba33