Merge "Fix atest VtsAidlKeyMintTargetTest" am: 0347422479 am: 0df8d23677

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9cdb68055749f8e2af43f67361dc69103d721b7