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

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

Change-Id: Ie54585ba246d4546ebaa270e881c66c1da8444fa