Merge "Revert "Updates tests for untrusted app MAC address restrictions"" am: 497049d4be am: 1c2e529a35

Original change: https://android-review.googlesource.com/c/platform/cts/+/1499097

Change-Id: I43c73ef0ecb6d72cbc0232fec7fe0f518f96ddae