Merge "Skip reSetOrganizationId_throws and enrollmentSpecificId_CorrectlyCalculated tests if wifi feature not supported" into main am: 1ba915c168 am: d55c4749ca

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3165187

Change-Id: Iee36c12f8719bd647ee232c44d28ee175d67a2d3
Signed-off-by: Automerger Merge Worker <[email protected]>