Merge "specify import version" am: e477b38157 am: 073b735d5e

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

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