Merge "DO NOT MERGE Fix for com.android.cts.devicepolicy.ManagedProfileTest#testCameraPolicy" into nougat-cts-dev