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

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

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