Merge "Revert^3 "Soft-enables new MAC address restrictions."" am: 4984bda13e

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

Change-Id: Iff4ead9309cee1d7b71981a4a0ebe577255d7e9a