Merge "OemLock functional VTS test." into oc-dr1-dev
am: 831af8d840

Change-Id: I97484727d9a5e103a00320bdc5dfce0adcf84b15