Merge "DO NOT MERGE CipherTest: test instance reuse with updateAAD" into marshmallow-cts-dev