Merge "Revert^2 "Soft-enables new MAC address restrictions."" am: 1e32ae2da2

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1499362

Change-Id: If1ac8e2603685858e297cc1de9048e98bb2aac43