Merge "Key{Mint,Master} VTS: fix incremental AES tags" am: e5c2bf01fc am: 523b300da7

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

Change-Id: I7925574830ff84e4d19666769fdf8285966e283e