Revert submission 15050857-RenameEnhancedMac
Reason for revert: Droidfood blocking Bug: 193375403
Reverted Changes:
I5d647a666:Rename Enhanced MAC Randomization to Non-Persisten...
I48a326f98:Update old terminology for Non-persistent Mac Rand...
Change-Id: Ic6ff02dad064f8d8c7dbaab51c658da12a4d8555