Android CTS 6.0 Release 7 (2906653)
Merge "DO NOT MERGE CipherTest: add test for multiple updateAAD calls" into marshmallow-cts-dev