[automerger skipped] Merge changes from topic "rkp-factory-tool" am:...

[automerger skipped] Merge changes from topic "rkp-factory-tool" am: 0ab5ef3f am: a23de7b9 -s ours am: 620aff6b -s ours am: a7e32b29 -s ours

am skip reason: Merged-In Icf9cfa165fbccb24b36b03ff3ce729a7e9c44cfd with SHA-1 415f0ce4 is already in history

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

Change-Id: Ib2f8b9369932b054b072e5ab7f361df5436ca21f