Merge changes from topic "rkp-factory-tool" am: 0ab5ef3ff7

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

Change-Id: I5911dab12da650546956131bd489bcf0db500594