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

Change-Id: I31d13650919cac6be76ae2f8a6519fa6e64a8741