Merge "Add test for additional ClearKey UUID." into oc-mr1-dev
am: 75c7efe507

Change-Id: I29db668def80306446cce7c76c9ac4acfebcfb1b