Merge "Merge "Add NativeClearKeySystemTest." into nougat-cts-dev am: f96407bf8c" into nougat-mr1-cts-dev am: c556b8adeb am: 87565ff346
am: 3b41d6bf0a  -s ours

Change-Id: If54a1e4db0b3a55d2a35d9885464b3831eae2fe5