[automerger skipped] Merge "DO NOT MERGE Fix for com.android.cts.devicepolicy.ManagedProfileTest#testCameraPolicy" into oreo-cts-dev am: af39964e18  -s ours am: b1e9682b86
am: d06009fddc

Change-Id: I09292619bb26fa70af3ac9fcddae1e7b860bc5b0