[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
am: a247745ddd  -s ours

Change-Id: I3334093926f7c0163df3f6ea5e0259500df76f9b