Merge "Make address type agnostic in mac address scan filtering." into mnc-dev