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

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

Change-Id: Id6eaa7257486031e6b7cc36dc81cf85fbdf83e51