Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Remove ClonedSecureRandomTest" into marshmallow-cts-dev am: 6d549abdf1  -s ours" into nougat-cts-dev am: c9ae83e2a6  -s ours" into nougat-mr1-cts-dev am: 51a5b53791  -s ours" into oreo-cts-dev am: fe1dffe281  -s ours" into oreo-mr1-cts-dev
am: f7b0b88153  -s ours

Change-Id: If11c773ceaf46bd1fc0dc02386764e37788f3a12