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