Merge "CipherTest: in ASN1 encoding for GCM, no value for tag size means 12" into nougat-cts-dev am: 986c0ac888 am: 9d4c0bc5a6
am: 85151b0164

Change-Id: I7e19e2e21df0f97ba43cc161d600c02530585d1f